Merge commit 'origin/master' into gallium-map-range