Merge pull request #934 from jmaas/master

Fix for importing Ubuntu. Fixes #929
Fix for importing Ubuntu. Fixes #928