Fixed logger locking issue that would cause server shutdown hang and block the webinterface
Merge branch 'master' into master-debug