Merge branch 'develop'

3 jobs for master in 20 minutes and 34 seconds (queued for 1 second)