Merge branch 'master' into dependency-upgrade

# Conflicts:
#	NOTICE
29 jobs for dependency-upgrade in 35 minutes and 35 seconds (queued for 4 seconds)