FYI,

I've checked this in to the 5.3 branch, an equivalent patch was 
committed to the mainline long ago.  Just that no one noticed :-/

enjoy,
Andrew