Merge pull request #1667 from eht16/issue1018_win_execute_builtin_path