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