[BUGFIX] PreBuild error when path contains directory name with spaces
Merge branch 'master' into leap