Fix to unicode problem in 2.7
Merge branch 'rosickey-master' into develop