repaired my breaking of Xiao's generic off-heap data container
Merge remote-tracking branch 'origin/master'