Merge pull request #1098 from totten/4.3-CRM-11160