CRM-12864
Merge pull request #1036 from yashodha/fixes

CRM-12864