T&R of 2.4.6

[Jim Jagielski]

Just a FYI: I plan to T&R 2.4.6 this afternoon (eastern).

It will be 2.4.5 minus r1485675. As such, 2.4.6 will still
ship with PR54948 un-patched, but I think it's safer to
do that instead of "rush" a revised patch thru.