5.014 fix for unicode problem

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
Merge remote-tracking branch 'my/master'