Update text.
Merge branch 'v2.2'
Merge branch 'master' into gh-pages