Stupid Maps
Merge pull request #359 from hilburn/1.7-update

Stupid Maps
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update