Merge branch 'master' into develop
Bugfix: Can now use a path containing a space.
Merge branch 'develop'