Command-line validator, WIP.
Improvements to the command-line validator
Merge remote-tracking branch 'upstream3/master'