Merge branch 'master' into feature-ok-really-add-mkl-this-time

# Conflicts:
#	gstlal/share/conda/envs/base/gstlal-dev-linux-64.yml
#	gstlal/share/conda/envs/lock/gstlal-dev-linux-64.lock