Merge pull request #2262 from yglb/master