Merge pull request #11484 from civicrm/4.7.30-rc