am 0a5b0166: Merge "Register _cleanup function with atexit"

* commit '0a5b01662316a06be68f3250c1b678c5ef17cc40':
  Register _cleanup function with atexit