Commit 789e260 tried to add support for -?, but there is a typo and instead -h was added when already present instead of -? for one of the cases. It works without this corrections, because all unrecognized options trigger usage showing as well, but this is more correct. This was bug 556706 originally.
Typo made in e054260