fix
launcher
Merge branch 'master' into ubuntu