CRM 12483 my first patch
Merge pull request #595 from Stoob/CRM-12483

CRM 12483 my first patch