Merge pull request #727 from ctiller/deprecate-c++

s/CreateChannel/CreateChannelDeprecated
diff --git a/src/node/examples/route_guide_server.js b/src/node/examples/route_guide_server.js
index bc9ed25..0d3b585 100644
--- a/src/node/examples/route_guide_server.js
+++ b/src/node/examples/route_guide_server.js
@@ -51,7 +51,7 @@
 var feature_list = [];
 
 /**
- * Get a feature object at the given point, or creates one if it does not exist.
+ * Get a feature object at the given point.
  * @param {point} point The point to check
  * @return {feature} The feature object at the point. Note that an empty name
  *     indicates no feature
diff --git a/src/python/src/grpc/_adapter/rear.py b/src/python/src/grpc/_adapter/rear.py
index 3fbcb24..d16fbee 100644
--- a/src/python/src/grpc/_adapter/rear.py
+++ b/src/python/src/grpc/_adapter/rear.py
@@ -382,6 +382,8 @@
   def join_fore_link(self, fore_link):
     with self._lock:
       self._fore_link = null.NULL_FORE_LINK if fore_link is None else fore_link
+      if self._rear_link is not None:
+        self._rear_link.join_fore_link(self._fore_link)
 
   def _start(self):
     with self._lock: