Merge pull request #1374 from dennishendriksen/master

Various fixes
Merge branch 'master' of https://github.com/molgenis/molgenis