Merge back from develop3d

Moar content pipeline