Fix single imports not working.
Merge branch 'master' into separate-depfail