Merge branch 'develop'

8 jobs for master in 12 minutes and 39 seconds (queued for 85 minutes and 56 seconds)