Merge branch 'wchar-implementation'

Conflicts:
	prompt.c