Merge pull request #12676 from civicrm/5.5