Buffering fix
Merge remote-tracking branch 'upstream/devel' into piece_deadlines