Patched version of telephone to work with feeds
Merge branch 'person_import'