Merge remote-tracking branch 'upstream/master' into sh-geo-fix-snippet-downloads

85 jobs for sh-geo-fix-snippet-downloads in 91 minutes and 38 seconds (queued for 5 seconds)