Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
v1.1.0
Merge branch 'gh-pages'