Merge branch 'v2.2.2' into 'master'

V2.2.2

Closes #67 and #66

See merge request !12
3 jobs for master in 3 minutes and 29 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Build
passed #8079
build

00:01:38

passed #8080
allowed to fail manual
build_shopmason

00:01:32

 
  Deploy
passed #8081
allowed to fail manual
deploy_production

00:00:18