Merge pull request #2348 from dlobo/CRM-13278