Merge "docs: Fix Doxygen parsing of @var descriptions with $var names"