Merge branch 'develop'

4 jobs for master in 10 minutes and 12 seconds (queued for 2 minutes and 56 seconds)