Fixes #3044
Merge branch 'master' of github.com:openframeworks/openFrameworks into bugfix-Makefile-project-source-paths-with-spaces-v2
Merge pull request #3127 from bakercp/bugfix-Makefile-project-source-paths-with-spaces-v2

Fixes #3044, replaces PR #3046
Merge branch 'master' of git://github.com/openframeworks/openFrameworks into win-fix