Merge pull request #9601 from civicrm/4.7.15-rc