Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 1 insertions, 0 deletions

diff --git a/staptree.h b/staptree.h
index 5125cd85..7e9506bb 100644
--- a/staptree.h
+++ b/staptree.h
@@ -231,6 +231,7 @@ struct target_symbol: public symbol
     };
   std::string base_name;
   std::vector<std::pair<component_type, std::string> > components;
+  std::string probe_context_var;
   semantic_error* saved_conversion_error;
   target_symbol(): saved_conversion_error (0) {}
   void print (std::ostream& o) const;