Merge branch 'upstream-zstd' into update-zstd # By zstd upstream * upstream-zstd: zstd 2021-05-14 (a488ba11)