Patches pushed as 68d7471cbded2cd820087197b2f495555e2954df and following
with a few modifications (updated revision numbers).
Thanks.