Add buffer back to output stream in destroy()
Merge remote-tracking branch 'origin/master'