Merge branch 'various_fixes' into 'master'

Various small config changes

See merge request !49
3 jobs from master in 39 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #152224256
lint_yaml_files

00:00:38

passed #152224255
pages

00:00:39

 
  Deploy
passed pages:deploy

00:00:01