Map updates.
Merge pull request #1382 from bridgetkromhout/master

Map updates.