I've updated the patch, one of the Bug 1137785 issues has been fixed in the latest git snapshot so I'll be submitting what I have to Factory.