Merge pull request #10956 from civicrm/4.7.24-rc