Merge branch 'enum-trailing-comma-doxygen'

* enum-trailing-comma-doxygen:
  Fix parsing of enums with trailing comma with -doxygen