Renamed remotely

[SVN r38356]
Merge from trunk.

[SVN r38774]
Merge from trunk.

[SVN r39329]
Merge latest quickbook from trunk.

[SVN r40450]
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.

[SVN r40452]