Merge remote-tracking branch 'origin/4.7.7-rc' into 4.7.7-rc-master-2016-05-04-14...
authorTim Otten <totten@civicrm.org>
Wed, 4 May 2016 21:21:22 +0000 (14:21 -0700)
committerTim Otten <totten@civicrm.org>
Wed, 4 May 2016 21:21:22 +0000 (14:21 -0700)

Trivial merge