Ok, I backported it. The only reason I didn't do it before was that there was a small merge conflict.