Merge branch 'dev' into 'master'

Dev

See merge request !51
3 jobs for master in 52 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Assets
passed #6367
node

00:00:16

 
  Pages
passed #6368
pages

00:00:35

 
  Deploy
passed pages:deploy

00:00:03