Comment 2 for bug 1446816

Assigning initial targets for pushing this through. Because this is a security fix, we may also wish to see this backported to rel_2_6 and a rel_2_6 security release made.

The change is simple enough, but good practice for including in a security dance. Reminder here to push this to the relevant branches prior to the next round of cuts.