Comment 31 for bug 1179955

I am comfortable taking the patch if it's been committed to master (and preferably to the stable branches).