shortbufs stuff
Use a buffer of shorts rather than longs in Field
Merge branch 'feature/shortbuffs'
Merge branch 'master' into feature/jocl