Merge pull request #10764 from civicrm/4.7.23-rc