Merge pull request #1416 from yangfl/master