attempted fix for unicode errors on logging
Merge branch 'master' into frodo-dev