Addded ImportTest.TestSplitBuf.
Added ImportTest.TestNextJson, fixed problems it reveals.
Merge branch 'sam_637' into v1.4.x