Merge pull request #1847 from eileenmcnaughton/CRM-9683