CMake external bump (nullptr OS X fix)
Merge branch 'master' of https://github.com/eile/Collage