Merge branch 'devel'

3 jobs for master
in 10 minutes and 7 seconds and was queued for 4 seconds