update version and CHANGELOG
Merge pull request #3800 from minggo/master

[ci skip]update version and CHANGELOG