Blocking 41880 from coming into /trunk since I already patched it in /trunk first...