[UPDATED] NSObject-ObjectMap to 2.1
Merge pull request #8815 from bennyguitar/master

[UPDATED] NSObject-ObjectMap to 2.1