latest from upstream

Allows clean aborts in the middle of a test run, in case it's
taking a long time.