Fixes cmake-gui causing RUN_IN_PLACE to be always off
Merge 'upstream/master' into minemovie