upstream synchronize
Merge pull request #3621 from minggo/develop

upstream synchronize