Merge "Fix GCC 4.9 complaint about int/size_t mismatch."