Merge branch 'devel'

2 jobs for 3.0
in 2 minutes and 14 seconds and was queued for 1 second
latest