Logging is now configurable via config-file
Merge remote-tracking branch 'upstream/devel' into devel