Minor change to doc/comptype pages generation
Merge branch 'master' into development

* master:
  Minor change to doc/comptype pages generation
Merge branch 'master' into experimental

* master:
  Minor change to doc/comptype pages generation
Merge branch 'development' into experimental

* development: