Merge pull request #6508 from nupplaphil/logger_enh