Merge pull request #10220 from civicrm/4.7.19-rc