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