Merge pull request #917 from aa65535/master