am 358c610c: (-s ours) am 3f7ecd9b: am 976fbb0c: am cc4aff99: 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 '358c610c93270bc1fc6729b51cf710db36d5c74a':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again