fixing merge conflict left in by accident
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop