Merge branch 'autobuild' into 'master'

Autobuild

See merge request !8
10 jobs for master in 1 minute and 58 seconds (queued for 2 minutes and 24 seconds)