Use NO_WRAP/DONT_BREAK_LINES when doing Base64 encoding
Merge branch 'master' into xep198