Merge commit 'origin/gallium-0.1'