[ci skip] Typo in CHANGELOG
Merge branch 'master' into 0.3.x