(I'll merge the new dev_4_4 fix as soon as I've checked it so we don't end up with another round of nitpicky corrections!)