Logging docfix (rebased onto develop)

Same as #376 but rebased onto develop.