Temp: ThangTypes don't require kind.
Merge branch 'master' into production