Fix Doxyfile
Merge branch 'master' into websockets