Some of you have seen this before. Just resending because
I based my next patch on top of this one.