update changelog
Merge pull request #4949 from minggo/develop

update changelog