Merge pull request #1101 from totten/4.3-CRM-11160-msg