Another auto-gen commit. I hope this works.

Merged the derped/meeped branch after figuring out it works.