The merge to 1.6 and onwards wasn't easy, so I would appreciate if someone could spot-check this for me.
I _think_ this (and the previous audit issue) were the only things we wanted to get into 1.5? Assuming so, should we start doing some testing to then shove this out the door (and move on again)?
- Josh
