Fix for github issue #2161
Fix for github issue #2160
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix for github issue #2140
Merge pull request #2167 from erwinwinder/master

Fix for github issue #2161