Merge branch 'more-config-options' into 'master'

Add more configuration options

See merge request !24
9 jobs for master in 2 minutes and 34 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Code Quality
passed #2305
code-quality

00:00:51

canceled #2303
code-quality

canceled #2299
code-quality

00:10:32

canceled #2298
code-quality

00:26:52

canceled #2295
code-quality

00:06:53

canceled #2294
code-quality

00:02:14

canceled #2286
code-quality

07:38:28

 
  Make Test
passed #2287
make-test

00:00:45

 
  Make Install
passed #2288
make-install

00:00:56