OK, seems like this will be unanimous unless for some reason @thbishop things not... 

I will assume Brett is correct (again), pull in his changes, and test again.