Fixed typo in option name
Some typos fixed.
Merge branch 'v7-stable' into v8-stable