Merge pull request #1098 from scunz/cleanup_in_cleanup Reset all static variables to NULL in clar's __cleanup