added a maximum buffer size of 16 MB for import, and removed some unused code
Merge branch 'next' into sam_1328_i
Merge branch 'sam_1328_i' into sam_1328_ii