Moving to  module instead of cutomer buffer concatenation.
Fixing up carrot that breaks 0.8
Attempting to fix on 0.8
Fixing merge conflict.
Merge pull request #1008 from mikeal/bl

Moving to  module instead of cutomer buffer concatenation.