Merge branch 'refs/heads/release'
Merge branch 'refs/heads/release'
Fixed a bug with smtp settings not being propagated into transport
Properly set charset for each part of multipart message.
Merge branch 'refs/heads/release'
Merge branch 'refs/heads/master' into release