Wordsmithing.
Merge pull request #752 from bhariharan/unstable

Wordsmithing.
Merge branch 'unstable' into community