Fixed a circular import
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop