Fixing stdout so it will properly handle UTF8
Merge branch 'master' into jira-stuff