Merge upstreams

diff --cc src/compress.lisp
index 172ff6d435fbc56743fcc61bb50300db8cf03e03,c3920f7edabb6e168e396d39757a75a1a94445cd..ff0d80ee951d082be5bdae9b3ac0dcfcd6eb365c
--- 1/src/compress.lisp
--- 2/src/compress.lisp
+++ b/src/compress.lisp
@@@ -14,10 -14,6 +14,9 @@@
  ;; KMR: zlib gives compression errors on random tests:
  ;;    indices outside of input array size
  ;; Using salza2 as default compressor
- 
 +(defun compress-zlib (data)
 +  (zlib:compress data :fixed))
 +
  (defun compress (data)
    (let ((comp (salza2:compress-data
                 data
@@@ -26,8 -22,8 +25,9 @@@
  
  ;; KMR: zlib appears to works fine with salza2 zlib compressor, but
  ;; moving to chipz as default decompressor as appears better supported
 -;;(defun uncompress-zlib (data)
 -;;  (zlib:uncompress data))
++
 +(defun uncompress-zlib (data)
 +  (zlib:uncompress data))
  
  (defun uncompress (data)
    (chipz:decompress nil 'chipz:zlib data))