Merge pull request #2197 from yangfl/master