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

This is the 5.4.96 stable release

# gpg: Signature made Sun 07 Feb 2021 09:36:26 AM EST
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key