Merge commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909' * commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909': add an accessor for Context for use by subclasses
Merge commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909' * commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909': add an accessor for Context for use by subclasses