Merge pull request #12657 from civicrm/5.5