Corrections to documentation.
Merge branch 'hotfix/1.1.6'