master
Merge branch 'upstream-zstd' into update-zstd
Merge branch 'upstream-zstd' into import-zstd
zstd: Enable multithreading support in build within CMake