Merge commit 'origin/master' into gallium-sampler-view