Merge remote branch 'upstream/gallium-0.1' into gallium-0.1