Evpath upstream

Eisenhauer, Gregrequested to merge
github/fork/eisenhauer/EVUpstream into master

Fixes to atexit() cleanup to prevent failure on multiple calls.

Merge request reports