Merged in longchar-typespecifier-fix branch