Merge branch 'dev' for v1.3.2

diff --cc .travis.yml
index 4f14407be6c5cc0fe895633895b13abdb17e675e,48d9ac3a672c9807fcccdb3cc81259affb73a47d..9e4dd4bf6a41fae9b5577a14efbcee87d68b604d
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -6,34 -6,25 +6,38 @@@ dist: trust
  matrix:
    include:
      # Ubuntu 14.04
 -    - env: Cmd='make gcc6install && CC=gcc-6 make clean uasan-test-zstd'
 -    - env: Cmd='make gcc6install libc6install && CC=gcc-6 make clean uasan-test-zstd32'
 -    - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-test-zstd'
 +    - env: Cmd="make gnu90build && make clean && make cmakebuild && make clean && make travis-install"
  
 -    - env: Cmd='make gcc6install && CC=gcc-6 make clean uasan-fuzztest'
 -    - env: Cmd='make gcc6install libc6install && CC=gcc-6 CFLAGS=-m32 make clean uasan-fuzztest'
 -    - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-fuzztest'
 +    - env: Cmd='make gcc6install && CC=gcc-6 make clean uasan-test'
 +    - env: Cmd='make gcc6install libc6install && CC=gcc-6 make clean uasan-test32'
 +    - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-test'
      - env: Cmd='make clang38install && CC=clang-3.8 make clean tsan-test-zstream'
 -
      - env: Cmd='make valgrindinstall && make -C tests clean valgrindTest'
  
 -    - env: Cmd='make arminstall && make armfuzz'
 -    - env: Cmd='make arminstall && make aarch64fuzz'
 -    - env: Cmd='make ppcinstall && make ppcfuzz'
 -    - env: Cmd='make ppcinstall && make ppc64fuzz'
 +    - env: Cmd='make arminstall && make armtest'
 +    - env: Cmd='make arminstall && make aarch64test'
 +    - env: Cmd='make ppcinstall && make ppctest'
 +    - env: Cmd='make ppcinstall && make ppc64test'
 +
- 
 +    - env: Cmd='make gpp6install valgrindinstall && make -C zlibWrapper test && make -C zlibWrapper valgrindTest'
 +    - env: Cmd='make gcc6install && CC=gcc-6 make uasan-test-zstd-nolegacy'
 +    - env: Cmd='make gcc6install && CC=gcc-6 make uasan-test-zbuff'
++
+     - env: Cmd='make -j uasanregressiontest'
+     - env: Cmd='make -j msanregressiontest'
+ 
+     - env: Cmd='make lz4install && make -C tests test-lz4'
 +    - env: Cmd='make -C tests versionsTest'
 +
 +    # OS X Mavericks
 +    - env: Cmd="make test"
 +      os: osx
 +
 +before_install:
 +  - if [ `uname` = "Darwin" ]; then brew update; fi
 +
 +install:
 +  - if [ `uname` = "Darwin" ]; then brew install xz; fi
  
  git:
    depth: 1