dsfsdf
Merge branch 'upstream/master'
Slime changelog update
What did I break
Dammit
Merge pull request #3766 from Kelenius/OfSlimesAndChangelogs

[CHANGELOG] Of slimes and changelogs