Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #2096 from erwinwinder/master

Fix invalid package structure after import