Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev08

# Conflicts:
#	zstd_compression_format.md

diff --cc lib/common/zstd_internal.h
Simple merge

diff --cc lib/compress/zstd_compress.c
Simple merge

diff --cc programs/bench.c
index c0bfd0dacf592f8b68a0f4b45617230a983f486d,2364348d621f323f6e75a89923634df8e5d797d0..c85ab2ed0150407669ee9e120ae1a1b1a537af75
--- 1/programs/bench.c
--- 2/programs/bench.c
+++ b/programs/bench.c
@@@ -132,9 -148,10 +140,10 @@@ typedef struc
  static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                          const char* displayName, int cLevel,
                          const size_t* fileSizes, U32 nbFiles,
 -                        const void* dictBuffer, size_t dictBufferSize, benchResult_t *result)
 +                        const void* dictBuffer, size_t dictBufferSize)
  {
      size_t const blockSize = (g_blockSize>=32 ? g_blockSize : srcSize) + (!srcSize) /* avoid div by 0 */ ;
+     size_t const avgSize = MIN(g_blockSize, (srcSize / nbFiles));
      U32 const maxNbBlocks = (U32) ((srcSize + (blockSize-1)) / blockSize) + nbFiles;
      blockParam_t* const blockTable = (blockParam_t*) malloc(maxNbBlocks * sizeof(blockParam_t));
      size_t const maxCompressedSize = ZSTD_compressBound(srcSize) + (maxNbBlocks * 1024);   /* add some room for safety */