Merge pull request #3877 from eileenmcnaughton/CRM-15148