import within function to eliminate cyclic import
Merge pull request #1253 from modilabs/signals_cyclic_import

import within function to eliminate cyclic import