Updating logging changes to latest develop branch

I want to avoid the merge weirdness I had in the past, where changes were overwritten.