changlog: Fixed typo.
Merge branch 'doc'
Merge branch 'master' into branch-2.x