Patch Set 7:

I asked for PMC supervision since I was not sure if figure 2 would apply for changes created by a committer pair-programming with a non-committer (therefore Edwin is also mentioned in the copyright statements). And this change is well beyond 250 LOC.