am 3682d65a: Merge "Update documentation generator to work with the Documentation system."

* commit '3682d65aaab94b7b2dd259a4c547e14dbaf79e09':
  Update documentation generator to work with the Documentation system.