Merge back from develop3d

Good thing all this crap is content pipeline stuff.