Merge pull request #9394 from seamuslee001/CRM-18493-46
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 15 Nov 2016 21:05:29 +0000 (10:05 +1300)
committerGitHub <noreply@github.com>
Tue, 15 Nov 2016 21:05:29 +0000 (10:05 +1300)
Backport of CRM-18493


Trivial merge