Merge pull request #12648 from civicrm/5.5