Merge pull request #10559 from civicrm/4.7.21-rc