CRM-13083
Merge pull request #1212 from yashodha/trunk

CRM-13083