Don't list temporary files when looking up options
Merge remote-tracking branch 'github/master'