Merge branch 'OptionsFix' into 'master'

Options fix

See merge request !46
2 jobs for master in 21 minutes and 47 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Linux
passed #1185932
githubjob

00:00:33

passed #1185933
masterJobLinux

00:21:46

82.0%