Changes to logging.
Merge origin/master