Patch Set 3: I would prefer that you didn't submit this; No score

I'm going to try and cherry-pick this over current master, and correct the few comments I have.  I agree with Matthias, we need to merge this sooner rather than later.