Merge with upstream. Fix make clean

This gives us DNS resolution.