Merge branch 'gallium-targets'