Merge back from develop3d

iNeedANap