Merge pull request #3915 from eileenmcnaughton/CRM-15168