Merge back from develop3d

I wonder if this will merge cleanly...