Open up for 2.3-dev
Fixed an incorrectly formatted help text for count options.
Merge branch '2.x-maintenance'