Merge pull request #12801 from civicrm/5.5