Merge branch 'settings_fix' into 'master'

Settings fix

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