doxy fixes
Merge remote-tracking branch 'trichter/3.1' into 3.1