am 1507bbb0: (-s ours) am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev

* commit '1507bbb00e78c297b1aca01f580f529b55009f94':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again