am 6d6c617f: Merge "Whitespace and doxygen fix"

* commit '6d6c617f6d6644c71bd83a0a17d258b4041c98cf':
  Whitespace and doxygen fix