Get rid of the last of pi3d.util.Log
Merge