Duplicate logger setting removed
Merge branch 'develop'