Quickbook: Merge from trunk to quickbook-dev

[SVN r75739]