We've accumulated a scary amount of local patches to this directory. I tried to merge them all, but if your favorite change is missing please reapply it manually (and send it upstream).