Merge pull request #3499 from kumpera/fix_logging