Merge pull request #12783 from civicrm/5.5