Update to c3dea33 from source