Merge back from develop3d

PNG OVERLOAD