Merge remote-tracking branch 'kblees/kb/devel/unicode-console-input'