Merge branch 'master' into github-ci-remove-conda-mutex