Merge branch 'gallium-format-cleanup'