Merge pull request #1976 from eileenmcnaughton/CRM-13737