oops, can't rely on context['self'] being defined
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop