Merge branch 'master' into 'master'

Merged into my fork, not main repo

See merge request i2p-hackers/i2p.i2p!26

apps/susimail/src/src/i2p/susi/util/DecodingOutputStream.java

@@ -60,6 +60,7 @@ public class DecodingOutputStream extends OutputStream {
 	        int toWrite = Math.min(len, _bb.remaining());
     	        _bb.put(buf, off, toWrite);
                 len -= toWrite;
+                off += toWrite;
             }
             flush();
         }