am 1def25a2: Merge commit \'7ac60686\' into manualmerge

* commit '1def25a210ca502a97020efb732775d5c2df2d9a':
  Prevent integer overflow when allocating native_handle_t