context stuff, test
Merge branch 'master' of https://github.com/mozboz/banana-personal-data-space
merged changes