Merge remote-tracking branch 'upstream/master' into libcFixes

Conflicts:
	libc/ctype.c
	libc/string.c