...
Merge branch 'master' of https://github.com/otse/cpph

Conflicts:
	planets/src/gl/opengl.cpp