Adjusted ToolsPackageDocumenter.
Merged master.