Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
fix for bug #920.
small formatting change
Merge pull request #987 from bartcharbon/master

fix for bug #920.