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