bring back autoLaunch: false (fix #2629, fix #3045)
Merge pull request #3056 from jlipps/master

bring back autoLaunch: false (fix #2629, fix #3045)