Merge pull request #8799 from JMAConsulting/CRM-16189-42
authorcolemanw <coleman@civicrm.org>
Tue, 2 Aug 2016 15:29:38 +0000 (11:29 -0400)
committerGitHub <noreply@github.com>
Tue, 2 Aug 2016 15:29:38 +0000 (11:29 -0400)
Backport CRM-16189-42 into 4.7.10-rc


Trivial merge