Merge branch 'dev' into 'master'

Dev

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

00:00:15

 
  Pages
passed #6142
pages

00:00:35

 
  Deploy
passed pages:deploy

00:00:02