am 5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev

* commit '5c980afc5eb78f8a2361e7eb9778345bdbe26a88':
  Show annotation information in generated documentation