Merge branch 'master' into 'beta'

Fix sucs site deploy script thing

See merge request !115
Status Job ID Name Coverage
  Test
passed #944
js-syntax-check

00:05:06

passed #943
php-syntax-check

00:01:04

 
  Deploy
passed #945
deploy-beta

00:00:42