Merge branch 'gallium-edgeflags'