Pass all tests.
Merge branch '94-LogClass' into daily