Merge pull request #484 from dlobo/CRM-12385