Martin's patch should be in 3.13. Marking this as fixed, since there hasn't been any response from the reporter for several months.