Quickbook: Merge from trunk to quickbook-dev