Merge remote-tracking branch 'UMS/master' into chardet