Commit ce196049fd61e79ce99ce9bbf368d70b40094386

Con Kolivas 2013-11-05T21:19:48

Clean up completely on avalon shutdown.