Merge pull request #1418 from yangfl/master