Merge pull request #241 from TheBlueMatt/2018-10-peer-free-panic