Merge with upstream (Fixed bug #66242 - don't assume char is signed)