Merge remote-tracking branch 'origin/4.7.8-rc' into 4.7.8-rc-master-2016-06-02-00...
authorTim Otten <totten@civicrm.org>
Thu, 2 Jun 2016 06:34:46 +0000 (00:34 -0600)
committerTim Otten <totten@civicrm.org>
Thu, 2 Jun 2016 06:34:46 +0000 (00:34 -0600)

Trivial merge