Merge back from develop3d

Eh.