Merge branch 'dev' into extraInput

diff --cc .travis.yml
Simple merge

diff --cc lib/lz4.c
Simple merge

diff --cc tests/Makefile
index 6404213,866ff5d..5a6ec59
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -104,9 -104,6 +104,9 @@@ datagen : $(PRGDIR)/datagen.c datagencl
  checkFrame : lz4frame.o lz4.o lz4hc.o xxhash.o checkFrame.c
        $(CC) $(FLAGS) $^ -o $@$(EXT)
  
-       
 +decompress-partial: lz4.o decompress-partial.c
 +      $(CC) $(FLAGS) $^ -o $@$(EXT)
++
  clean:
        @$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
        @$(MAKE) -C $(PRGDIR) $@ > $(VOID)
@@@ -394,12 -401,12 +405,12 @@@ test-lz4-dict: lz4 datage
  
  test-lz4-hugefile: lz4 datagen
        @echo "\n ---- test huge files compression/decompression ----"
-       ./datagen -g6GB   | $(LZ4) -vB5D  | $(LZ4) -qt
 -      $(DATAGEN) -g6GB   | $(LZ4) -vB5D  | $(LZ4) -qt
 -      $(DATAGEN) -g5GB   | $(LZ4) -v4BD  | $(LZ4) -qt
++      ./datagen -g6GB    | $(LZ4) -vB5D  | $(LZ4) -qt
 +      ./datagen -g4500MB | $(LZ4) -v3BD | $(LZ4) -qt
        # test large file size [2-4] GB
-       @./datagen -g3G -P100 | $(LZ4) -vv | $(LZ4) --decompress --force --sparse - tmphf1
+       @$(DATAGEN) -g3G -P100 | $(LZ4) -vv | $(LZ4) --decompress --force --sparse - tmphf1
        @ls -ls tmphf1
-       @./datagen -g3G -P100 | $(LZ4) --quiet --content-size | $(LZ4) --verbose --decompress --force --sparse - tmphf2
+       @$(DATAGEN) -g3G -P100 | $(LZ4) --quiet --content-size | $(LZ4) --verbose --decompress --force --sparse - tmphf2
        @ls -ls tmphf2
        $(DIFF) -s tmphf1 tmphf2
        @$(RM) tmphf*