Handle the implecit conversion from NSUInteger on 64-bit to int
to avoid warnings when compiling on 64-bit
Merge branch 'bugfix_long_to_int_warning' into develop
Merge branch 'develop'