Merge branch 'gallium-new-formats'