Merge branch 'release/0.3.6' into develop
Merge branch 'master' into develop
Handle UTF-7 decode errors more gracefully.
If there's a UTF-7 decode error then just try the user name as passed in the header.
Bumped version number
Merge branch 'release/0.3.7'