Merge commit 'origin/gallium-0.2' into gallium-master-merge