Dev/master merge. Using dev map, all master map changes have been disregarded. DO NOT MERGE WITHOUT DEV DISCUSSION.

I'm still not clear on how the Hell you guys let the branches diverge this far. Map changes on master made since Snapshot's bugfix commit on the 10th will need to be reapplied.