Fixes #1330: Allow non-ambiguous shortened longopts.
Merge branch '4.1' into 4.2
Merge branch '4.2'