Merge back from develop3d

meep