Merge pull request #901 from dlobo/CRM-12674