Merge pull request #12644 from civicrm/5.5