Here is the patch again complete with documentation changes I missed before.