hide __b64_ntop/pton inside base64_encode/decode from utils
Merge branch 'master' into portable
add all allowed email address characters and escape those that are
considered dangerous
Merge branch 'master' into portable