python 3 based fix for base 64 encoding in smtp
Merge branch 'origin/master'