Some minor changes to logging stuff
Merge branch 'master' into snapSkeleton