modified
Merge branch 'master' into esmtp

Conflicts:
	smtp_test.go
modified
modified