Merge pull request #9934 from civicrm/4.7.17-rc