Patch Set 1: Looks good to me, approved; Unclean IP, do not check in

I wish we could include this in 0.11.3, but its a non-committer authored patch. That's why it missed 0.11.1 in the first place.

:-(