Merge commit 'origin/master' into glsl-pp-rework-2