Merging with master

diff --cc src/Serialize/serializer.cc
index cfad4e8a29b52f3c2c390072f1ca6393d411bf6f,daa8ba015bba9514ae31ebd216bc71e02e51756c..d970676a3c446b3cea8fe6a862ff3f36f798421b
--- 1/src/Serialize/serializer.cc
--- 2/src/Serialize/serializer.cc
+++ b/src/Serialize/serializer.cc
@@@ -61,8 -65,8 +65,9 @@@ void Serializer::mywrite(const void *__
  
                        if (spacefree < __n) {
                                flushBuffer();
+                               __n -= datatowrite;
                                towrite += datatowrite;
 +                                __n-=datatowrite;
                        } else if (spacefree == __n) {
                                flushBuffer();
                                return;