Bz958

This is just the minimal BufferManager patch.