Merge pull request #12515 from civicrm/5.4