Merge quickbook.
Merge removal of quickbook 1.6 warning.

I forgot to check this in to trunk, and then accidentally included it with some
circular buffer changes which is why the history is a little odd.