WOW THANKS ASSHOLE
Merge pull request #6309 from MrPerson/changelog_p

And also the guns