Merge branch 'updates' into 'master'

Updates

See merge request !12
1 job for master
Status Name Job ID Coverage
  Deploy
passed build-image