Merge branch 'master' into 'autobuild'

Master

See merge request !7
21 jobs for autobuild in 7 minutes and 51 seconds (queued for 4 seconds)