Fix handling of end of command options (`--`) in `OptionParser`
Merge pull request #2265 from lexmag/master

Fix handling of end of command options (`--`) in `OptionParser`