Merge pull request #947 from GeneFerneau/hash