am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"

* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
  Don't assume that size_t is 32-bit