updated with master

28 jobs for dependency-upgrade in 20 minutes and 39 seconds (queued for 6 seconds)