Merge pull request #10406 from civicrm/4.7.20-rc