Merge pull request #2334 from yglb/master