Changed examples to use new option names
Readying 2.8 release
typo
Merge branch 'dev' into ms