Merge commit 'origin/master' into gallium-msaa