Merge pull request #3530 from eileenmcnaughton/CRM-14263