Merge pull request #10593 from civicrm/4.7.21-rc