Merge pull request #9921 from civicrm/4.7.17-rc