Also integrates changes from https://github.com/PCSX2/pcsx2/commit/904ffb5d20d6a3a004aa89797a842b03bf3c1ad6
« Back to merge proposal
Also integrates changes from https:/ /github. com/PCSX2/ pcsx2/commit/ 904ffb5d20d6a3a 004aa89797a842b 03bf3c1ad6