Better placement of calls to Thread#abort_on_exception
Minor variable name change.
Merge branch 'master' into supervisor
Better testing of NullThreadPool
Merge branch 'master' into supervisor