Merge branch 'master' of gitlab.science:mlubbers/mTask