Merge pull request #6044 from monishdeb/CRM-16575
authorMonish Deb <monish.deb@webaccessglobal.com>
Fri, 19 Jun 2015 07:04:14 +0000 (12:34 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Fri, 19 Jun 2015 07:04:14 +0000 (12:34 +0530)
Crm 16575, CRM-16581 fixes


Trivial merge