Merge pull request #8395 from monishdeb/CRM-18405
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 19 May 2016 09:29:16 +0000 (21:29 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 19 May 2016 09:29:16 +0000 (21:29 +1200)
commit78087d5c5788337bd250dea48e2606cc533bbd5e
tree07e2bc99d0982a597ba30f6687c581712f509352
parentcda932b7408fb699cf1f89218cd3fcc15a921719
parenta146f84aaf8cd9a870ff3bc9516a768a1194f874
Merge pull request #8395 from monishdeb/CRM-18405

CRM-18405: Backport master fix