removed commented out code.
Complain for unparsed arguments of the command line string.
Merge branch '4.4'
Merge remote-tracking branch 'origin/master'