merged upstream/develop

8 jobs for master in 22 minutes and 4 seconds (queued for 12 seconds)