Merge "Update documentation generator to work with the Documentation system."