Added a couple more default context excludes
Merge remote-tracking branch 'origin/master'