Merge branch 'gallium-docs'