Workaround for Safari 7.1: The Map constructor doesn't support arguments.
Merge branch 'fix-map-constructor'.