Merge pull request #1081 from eileenmcnaughton/CRM-12988