Merge pull request #165 from TheBlueMatt/2018-09-pre-disconnect-misc