Merge "fix a signed/unsigned comparison warning"