probably fix build stuff and update gen tools
Merge remote-tracking branch 'upstream/oneman'