Merge pull request #774 from trenkel/master