See attached patch, which has been on the list for a few days.
Technically, you posted the first version of this before the freeze was announced, so I think it's fair to put it in, also considering the number of revisions you have made.
Regards, Asger
