Merge pull request #12792 from civicrm/5.5