Merge from trunk.
Merge from trunk.
Merge latest quickbook from trunk.
Add include-path (I) option so that one can refer to files to import or include outside of the usual quickbook tree without using absolute paths.