Merge pull request #10896 from civicrm/4.7.24-rc