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

* commit '644f4076dd9452ac6e5596b111ec9e6386f5d0a4':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again