Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
(Done just so we don't get later conflicts due to cherry-picking.)
This commit is contained in:
commit
f3f52db398
(Done just so we don't get later conflicts due to cherry-picking.)