Merge remote-tracking branch 'fdo/master'