Merge pull request #3901 from eileenmcnaughton/CRM-15168