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 'cc4aff9939eb49c3acbc9898cbda030b674c6d3b':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again