Merge back from develop3d

Yup.