Logging 2.0 release branch

This is all the work done for version 2.0 of logging.