Fix #604
Merge remote-tracking branch 'kovidgoyal/fix-unicode-in-setup' into develop