Merge branch 'release/1.1' into gh-pages

Closes #1