v2.1
Merge branch 'master' into gh-pages