I think we may have to try some MIMA here to make sure this actually is binary compatible.   I can merge as-is, but I'll have to double check manually before the RC of 0.13.2