Merge tag 'v5.4.48' into v5.4/standard/base

This is the 5.4.48 stable release

# gpg: Signature made Mon 22 Jun 2020 03:31:27 AM EDT
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key