Fix import for vumi#574.
Merge branch 'develop' into develop-frontend