Merge pull request #116 from aabes/release/fred/master

attempt to fix reset issues on multi nic nodes