Merge pull request #2384 from joto/no-verbose-help

Merge pull request #2384 from joto/no-verbose-help #1401