Now using context everywhere for tm interactions.
Merge branch 'master' into replication
Merge pull request #214 from youtube/replication

Now using context everywhere for tm interactions.