Merge pull request #6809 from nupplaphil/task/logger_tests