Merge pull request #8741 from seamuslee001/CRM-18568-46
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 25 Jul 2016 03:00:23 +0000 (15:00 +1200)
committerGitHub <noreply@github.com>
Mon, 25 Jul 2016 03:00:23 +0000 (15:00 +1200)
CRM-18568 Port fix from Eileen to 4.6


Trivial merge