Merge pull request #7191 from eileenmcnaughton/master
authorMonish Deb <monish.deb@webaccessglobal.com>
Thu, 12 Nov 2015 10:39:22 +0000 (16:09 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Thu, 12 Nov 2015 10:39:22 +0000 (16:09 +0530)
CRM-17539 & progress on CRM-16929


Trivial merge