Fixed typo in help output
Merge branch 'dev' into ms