Merge pull request #1471 from Anson-Huang/master