Fix four hex digit encoding.
Merge remote-tracking branch 'upstream/master'