Merge pull request #3503 from eileenmcnaughton/CRM-14866