Merge pull request #1530 from aa65535/master