Because it has been so long, the latest patch has bitrotted. I really think at this point shaming people into reviewing this is my only option. Give me a few hours or days to get a new patch that applies cleanly to origin/master. Thanks raid5atemyhomewkr