Ready for 2.4
Corrected a help option regression.
This is 2.4
Merge branch '2.x-maintenance'