changelog,gh-17: Remove entry because it is a duplicate.
Merge branch 'doc'
Merge branch 'master' into branch-2.x