Merge branch 'gallium-s3tc'