> I'm going to let this chill a bit on mainline and then check in to
> 4.6.x.

Seems fine so I dropped this into the 4_6-branch

tested x86/linux

-benjamin