Merge pull request #8518 from twomice/CRM-18770
authorcolemanw <coleman@civicrm.org>
Tue, 7 Jun 2016 05:06:21 +0000 (23:06 -0600)
committercolemanw <coleman@civicrm.org>
Tue, 7 Jun 2016 05:06:21 +0000 (23:06 -0600)
Fix for CRM-18770.


Trivial merge