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

This is the 5.4.47 stable release

# gpg: Signature made Wed 17 Jun 2020 10:40:40 AM EDT
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key