Merge pull request #12760 from civicrm/5.5