Master importer from 2.3.x

This brings in a number of fixes discovered in my 2.3.x branch maintained for MapStory.