Fixed signed/unsigned comparison warning
Merge 3.3