Merge branch 'master' into 'master'

Master

See merge request !61
2 jobs for master in 13 seconds (queued for 1 second)