Merge branch 'callout_smtp_tpt_merge'
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 21 Jan 2017 22:30:00 +0000 (22:30 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sat, 21 Jan 2017 22:30:00 +0000 (22:30 +0000)

Trivial merge