Merge pull request #2420 from yangfl/master