Comment 30 for bug 1179955

Patch is currently under consideration by upstream. Can either apply it now or wait for inclusion in the next release.