Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1