#2150
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #933 from jjettenn/master

#2150