It seems that my mail didn't get sent due to flaky internet, but I've
pushed the patches to master - closing.