Merge branch 'commandline-patch' into 'master'

Commandline patch

See merge request !122
9 jobs for master in 19 minutes and 39 seconds (queued for 5 seconds)