Merge With Care

[billroper]

I've nearly finished the particular Merge From Hell that I was working on at OVFF. I figured while checking this in -- which will probably take most of two days! -- I could test some other code that I've written.

Sadly, that branch of code is now contaminated with changes that someone else made, so I can't test it until I -- you guessed it! -- merge in all of his changes.

Thud, thud, thud.