Merge pull request #8462 from eileenmcnaughton/hack
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 27 May 2016 05:35:56 +0000 (17:35 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Fri, 27 May 2016 05:35:56 +0000 (17:35 +1200)
 CRM-18684 fix fatal error by backporting 4.7 hack


Trivial merge