Merge pull request #3475 from eileenmcnaughton/CRM-14822