Wordsmithing.
Merge pull request #840 from bhariharan/unstable

Wordsmithing.
Merge branch 'unstable' into community