Merge branch 'hotfix/horrible_bug'
Merge branch 'master' into develop
crlf crap