automatically clean up after removing a head-node
Merge branch 'master' into grizzly