Merge "Fix Unicode handling." into pi-dev