Merge "Fix an arithmetic error when using unsigned"