Merge pull request #953 from szuke/master