Merge pull request #4322 from jmcclelland/mass-sms-logging