Those two patches, now on github!

As discussed. Does the second ("Document") patch apply Ok now?