Merge back from develop3d

Could really go for a drink right about now.