line up the help message
Merge branch 'master' into release