Changes
Merge branch 'master' into the-merger

Conflicts:
libs/openFrameworks/app/ofAppRunner.cpp