Merge branch 'master-merge' into 'master'

Master merge request

See merge request !15
2 jobs for master in 8 seconds (queued for 8 seconds)