I know you guys said there aren't any more planned releases for the 2.4 train, but I had to do this backport anyway to run in production until 2.5 is out for a while and we have the chance to plan an upgrade, so I thought I might as well send it your way. Maybe there will be an unplanned release of 2.4 :).