Merge branch 'zstd-next' into zstd-linus