Merge branch 'dev' into decTest

contrib/single_file_decoder/create_single_file_decoder.sh

@@ -5,6 +5,7 @@ ZSTD_SRC_ROOT="../../lib"
 
 
 # Amalgamate the sources
+echo "Amalgamating files... this can take a while"
 ./combine.sh -r "$ZSTD_SRC_ROOT" -r "$ZSTD_SRC_ROOT/common" -r "$ZSTD_SRC_ROOT/decompress" -o zstddeclib.c zstddeclib-in.c
 # Did combining work?
 if [ $? -ne 0 ]; then