Doc/trouble

Fix apidoc generation, and remove some remnants of reliance on six

Merge request reports

Loading