adopt another base64 js
Merge branch 'master' into devel