Merge commit 'origin/master' into cogl-material