Merge branch 'master' into 'master'

Master

See merge request !41
1 job for master in 1 minute and 57 seconds (queued for 42 seconds)
Status Job ID Name Coverage
  Deploy
passed #1536
pages

00:01:57