Merge pull request #3301 from harfbuzz/hashmap-classes

Hashmap classes