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

* commit 'b67a3c271616d7b2506ead15e97c6a840b5eb5a8':
  Fix GCC 4.9 complaint about int/size_t mismatch.