Merge With Caution

[billroper]

I've just merged the many changes from the upcoming release of the product into the public branch for the release that follows this one. Three hundred plus files later -- and after a good bit of hand-editing -- I've finally gotten this mess to compile.

It can check in overnight. Because I'm not going to wait the five hours for the check in to finish before going home...