Renamed a few things to make things clearer, and to avoid naming conflicts with context keys.
Merge remote-tracking branch 'origin/master'