Committing some (slightly modified) changes from Sebastiaan that result in two xdoc databases so that they don't overwrite each other (note that the unnecessary one of those two databases is automatically correctly deleted as part of the manual generation process)

Updates #133
Merge commit '77b29d59ad992f057e2ed55b44aeed1a88fba6fc' into HEAD