updated with master

30 jobs for dependency-upgrade in 28 minutes and 35 seconds (queued for 5 seconds)