Merge pull request #1209 from jwillemsen/jwi-doxygen2