Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of github.com:mayabrandi/scilifelab into develop