Merge "Adds functionality specified by uchar.h"