Merge pull request #12677 from civicrm/5.5