Merge pull request #795 from kangax/issue-794