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

* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit