Merge "Upstream atexit"