Fix issue when creating a launch configuration with a space in its name
Merge branch 'master' into phantom0.2