Merge pull request #762 from afs/buffering-writer

JENA-1919, JENA-1920: Fixes for BufferingWriter