Quickbook: Merge from trunk to quickbook-dev.
Quickbook: Merge from trunk.

Includes blocks in lists fixes, and some documentation changes.