That diff looks fine. I'll apply it myself later if nobody else does.