Merge branch 'master' into gallium-0.2