Merge branch 'khrys' into 'master'

Khrys

See merge request !24
2 jobs for master in 52 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed pages #302094

00:00:52

 
  Deploy
passed pages:deploy

00:00:00