Manual merge of #330.
Manual merge of #330.

Rhodan81/xenia,KitoHo/xenia,toxic88/xenia,bradparks/xenia__xbox_emulator,toxic88/xenia,sephiroth99/xenia,herman-rogers/xenia,herman-rogers/xenia,DaTrollMon/xenia,TRex22/xenia,MorganBauer/xenia,no1dead/xenia,bradparks/xenia__xbox_emulator,bradparks/xenia__xbox_emulator,no1dead/xenia,TRex22/xenia,DaTrollMon/xenia,AbaiQi/xenia,Drooids/xenia,maxton/xenia,DaTrollMon/xenia,pwz3n0/xenia,wrren/xenia,no1dead/xenia,sabretooth/xenia,toxic88/xenia,TRex22/xenia,sephiroth99/xenia,Drooids/xenia,TingPing/xenia,MorganBauer/xenia,TingPing/xenia,galek/xenia,KitoHo/xenia,maxton/xenia,bowlofstew/xenia,ObsidianGuardian/xenia,bowlofstew/xenia,MorganBauer/xenia,Rhodan81/xenia,sephiroth99/xenia,bowlofstew/xenia,MorganBauer/xenia,wrren/xenia,galek/xenia,wrren/xenia,Drooids/xenia,bradparks/xenia__xbox_emulator,AbaiQi/xenia,greg100795/xenia,greg100795/xenia,Rhodan81/xenia,KitoHo/xenia,Rhodan81/xenia,wrren/xenia,AbaiQi/xenia,sabretooth/xenia,KitoHo/xenia,ObsidianGuardian/xenia,pwz3n0/xenia,bowlofstew/xenia,pwz3n0/xenia,herman-rogers/xenia,greg100795/xenia,Drooids/xenia,galek/xenia,herman-rogers/xenia,sabretooth/xenia,toxic88/xenia,galek/xenia,ObsidianGuardian/xenia,TingPing/xenia,pwz3n0/xenia,maxton/xenia,greg100795/xenia,TingPing/xenia,no1dead/xenia,AbaiQi/xenia,DaTrollMon/xenia