Merge branch 'release/0.9.3' into develop
Fix encoding issue.
Silence silly py2.7 test errors.
Fix little encoding issue.
Merge branch 'release/0.9.4'