Merge https://github.com/notaz/pcsx_rearmed