Merge pull request #114 from Abscissa/master

Fix #12149: ".exe" not auto-added with -of on windows.
Merge pull request #115 from MartinNowak/pick114

Merge pull request #114 from Abscissa/master