am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken