Fix changelog typo
Merge branch '2.1-merge-2.0' into 2.2-merge-2.1