Merge changes I0517eb7d,I87fbe12d

* changes:
  Add base64.
  Remove more strncpy() calls.