Merge branch 'master' into 'master'

Master

See merge request !141
2 jobs for master in 37 seconds (queued for 9 seconds)