Still fixing doc typo.
Merge branch 'hotfix/2.1.18'