Merge branch 'gallium-userbuf'