integrate release 0.30 to master
integrate release 0.31 to master
Update CHANGES.md
useless
fix conflict