Removed setcontext, not we do not modify context tables anonymore, which is great.
Merge remote-tracking branch 'origin/master'