Fix build location in git.
Merge branch 'quickbook-1.6'