Merge pull request #10600 from civicrm/4.7.21-rc