Scott Marlow, we might want to consider backporting this into 4.2, assuming we'll have another release there. See