Quickbook: Merge from trunk to quickbook-dev.

[SVN r73239]
Quickbook: Merge to quickbook-dev.

[SVN r73983]