Merge branch 'pipeline' into 'master'

Pipeline

See merge request !195
4 jobs for master in 9 minutes and 49 seconds (queued for 1 minute and 1 second)