Change help message to reflect reality.
Merge branch 'master' into make+docs