pulling in new stuff.
merged
Fixed broken tests.