Merge branch 'master' into report-upload-failures