Merge pull request #178 from TheBlueMatt/2018-09-channel_reestablish