Merge branch 'master' into develop
?
Merge branch 'develop' finally fixed my derpiness