Cleanup builders on interruption when called directly
Merge pull request #131 from domcleal/builder-cleanup

Cleanup builders on interruption when called directly