Merge branch 'nirgov' into HEAD

Samo Penic

2016-12-06 0634b97e436e480b203a22e1113c473d3ae4d281

 src/tsmeasure.c

@@ -84,7 +84,6 @@
         tape_free(vesicle->tape);
         vesicle_free(vesicle);
               }
      free(ent);  
      }
   for (n = 0; n < count; n++)
     {