Merge pull request #1658 from reaperhulk/move-hash-interfaces

Move hash interfaces