Fixup whitespace
Merge branch 'develop' into fix-hitboxes