Merge branch 'dev' into 'master'

Dev

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

00:00:15

 
  Pages
passed #6509
pages

00:00:34

 
  Deploy
passed pages:deploy

00:00:02