Merge pull request #8326 from mollux/CRM-18510-4.6
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 25 May 2016 10:25:38 +0000 (22:25 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 25 May 2016 10:25:38 +0000 (22:25 +1200)
CRM-18510 Backport 4.7 changes.


Trivial merge