Merge pull request #8530 from seamuslee001/CRM-18772-46
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 8 Jun 2016 05:08:10 +0000 (23:08 -0600)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 8 Jun 2016 05:08:10 +0000 (23:08 -0600)
CRM-18772 46 backport


Trivial merge