Merge branch 'dev'

keep local .travis.yml

diff --cc .travis.yml
index a5cb445eea7680b8e998c3d21bd678e4781c9c55,a52d57af3edd8e82a097c9b2ed41c85df97f3d8f..3f98ea04dd75e0e0ac76b21103614d81303bab7d
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -6,30 -6,21 +6,29 @@@ 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 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 -C tests versionsTest'
 +    - env: Cmd='make gpp6install && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
 +      install:
 +        - export CXX="g++-6" CC="gcc-6"
 +    - env: Cmd='make gcc6install && CC=gcc-6 make uasan-test-zstd-nolegacy'
 +    - env: Cmd='make gcc6install && CC=gcc-6 make uasan-test-zbuff'
 +
 +    # OS X Mavericks
 +    - env: Cmd="make gnu90build && make clean && make test && make clean && make travis-install"
 +      os: osx
  
  git:
    depth: 1