Some text clarifications.
Merge branch 'hotfix-2.1.3'