Include doc theme without recursive Makefiles
Merge branch 'master' into draft-10
Revert 748f6e65bd57581f66715db9a433c12625a535a7