Merge branch 'hotfix/crazy-bug'
Nice one
Merge branch 'hotfix/important-fix' into develop