Properly find import root
Merge remote-tracking branch 'upstream/master'