Merging MSND-83 to 2.9.x


git-svn-id: https://source.sakaiproject.org/svn/mailsender/branches/1.7@123808 66ffb92e-73f9-0310-93c1-f5514f145a0a