Merging Develop3d Changes

I'm merging over fixes from develop3d.