Corrected problems with the intermediate buffer (most notably rewinding)
Merge remote-tracking branch 'origin'