Logging config now uses correct file
Merge branch 'release_1.0' into develop