Merge branch 'master' of https://github.com/molgenis/molgenis
Fix test
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix MolgenisDbSettingsTest
Merge pull request #952 from erwinwinder/master

fix tests