Merge pull request #135 from yuntai/201808-channelreestablish