Merge branch 'master' into glsl

Conflicts:
	src/glwidget.cpp