Merge branch 'hotfix/rasmus'
fixed typo
Merge branch 'hotfix/ISSUE-152' into develop