Hope you don't mind Jimita, but we really would like to have this fix for software at least, so I made a copy of it on our repo a while back.
Fixes exactly what it says in the title.