Merge branch 'master' into development

3 jobs for development in 2 minutes and 26 seconds
Status Job ID Name Coverage
  Build
passed #4644
build

00:02:14

manual #4645
allowed to fail manual
build_shopmason
 
  Deploy
passed #4646
deploy_staging

00:00:11