Merge "Fix a trivial signed vs unsigned comparison for gcc 4.7."