Merge #13922: argparse no longer incorrectly strips '--' after the first one.

Patch by Jeff Knupp.