Merge branch 'master' into 'master'

Master

See merge request !151
2 jobs for master in 40 seconds (queued for 6 seconds)