Merge branch 'next' of github.com:cryfs/cryfs into next

.travisci/build_and_test.sh

@@ -24,10 +24,10 @@ make -j$NUMCORES
 ./test/parallelaccessstore/parallelaccessstore-test
 ./test/blockstore/blockstore-test
 ./test/blobstore/blobstore-test
+./test/cryfs/cryfs-test
 
 # TODO Also run on osx once fixed
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
   ./test/fspp/fspp-test
-  ./test/cryfs/cryfs-test
   ./test/cryfs-cli/cryfs-cli-test
 fi