We've been using this patch at work for a while. It should be upstream and available for all. Enjoy!
Bug watches keep track of this bug in other bug trackers.