Make sure our context gets set.
Merge pull request #14 from jordandukart/7.x

Make sure our context gets set.