Launcher fix.
Merge origin/master