// wording
Merge pull request #1701 from djfm/1.6

// wording