Fixes for workspace importing
Merge branch 'master' of https://github.com/flotter/mix