Merge branch 'jk/t5000-gzip-simplify'