patched CRM-12437
Merge pull request #667 from kurund/CRM-12437

patched CRM-12437