Merge commit 'origin/gallium-0.1' into gallium-0.2