Merge pull request #2489 from minggo/master

update version and changelog