fixed ImportError caused by circular reference
Merge branch 'HalloweenBugFixes'