I've updated the patch to no longer conflict with the latest master.