Merge pull request #1 from PCSX2/master

Test