python 3 unicode fix
Merge branch 'master' into stable

Merge in unicode change