grammar fix #2788
Merge branch 'staging' into comment2688