Merge branch 'mesa-2d-registers'