2.2.0 Stable.
Merge branch 'master' into gh-pages