am 54d87d9d: (-s ours) am 563f1113: am ccf405f4: am c7b2c9c8: 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 '54d87d9d943326cbcaf9f4b342dd28e85e8a3e74':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again