Isolate doc generation
Merge remote-tracking branch 'upstream/master' into fix/mysqlloader