Merge pull request #2226 from yangfl/master