Merge branch 'develop'

16 jobs for master in 18 minutes and 30 seconds (queued for 14 minutes and 16 seconds)