Merge branch 'fix_doxygen' into 'master'

Fix doxygen

See merge request !16
12 jobs for master in 3 minutes and 41 seconds (queued for 1 second)