Merge branch 'master' into 'master'

Master

See merge request !145
2 jobs for master in 36 seconds (queued for 5 seconds)