Merge branch 'master' into develop.
Tweak Doxyfile and update code documentation.