Merge branch 'commandline' of https://github.com/RobSis/MathMLCan
Merge remote-tracking branch 'upstream/master'