Merge branch 'master' into STAHP-codecov-mails