Squashed 'importmagic/' changes from 9be0121..f879269

f879269 Fix module imports.

git-subtree-dir: importmagic
git-subtree-split: f879269a8c60604709dc0d86540d304a201b8d02
Merge commit 'f9042687d0e1d53940e20f73b62422fb347276ba'