Quickbook: Merge from trunk to quickbook-dev.
Quickbook: Merge in rev. missed before
Quickbook: Merge to quickbook-dev
Quickbook: Merge from trunk.

Includes blocks in lists fixes, and some documentation changes.