Merge branch 'master' into gallium-sampler-view