v1.0.12: bug 822 migration fix

I guess I pushed up the 1.0.12 tag, but not development so this needs to get merged in now. :/