Fix for importing Ubuntu. Fixes #928
Merge pull request #935 from jmaas/master

Fix for importing Ubuntu. Fixes #928