Merging Traffic

[billroper]

Things are prepped for the final merge and being tested for both my long-lived branch and -- well, the other fix that I"m working on is not exactly *tiny*, but it's a whole bunch of tweaking of a single file.

Let's see if things will be good enough to pass testing.