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