Merge branch 't0mm0-hitbox'