ObjectMap updated to latest.
Merge branch 'origin/master'