Merge pull request #427 from dlobo/CRM-12353