Closes #3297
Merge branch 'master' of github.com:openframeworks/openFrameworks