Comment 5 for bug 1037171

I am finally caught up here. I will setup a testing environment this weekend and try to resolve the confilicts.

There is an error with this commit as well. I have fixed it in the version I am using for Sitka, so I will modify my working branch to take into account that fix.