Merge pull request #8641 from civicrm/4.7.9-rc