Merge pull request #12520 from civicrm/5.4