Merge pull request #12725 from civicrm/5.5