Added some logging scaffolding
merging master into snapSkeleton, no conflicts