8a2c40e backport fix for command line parsing from upstream master

Authored and Committed by adamwill 7 years ago
    backport fix for command line parsing from upstream master
    
        
file modified
+5 -1