Merge branch 'master' into videosoftware-xfb Conflicts: Source/Core/VideoBackends/Software/Src/EfbCopy.cpp Source/Core/VideoBackends/Software/Src/SWRenderer.cpp Source/Core/VideoBackends/Software/Src/SWRenderer.h Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp Source/Core/VideoBackends/Software/Src/SWmain.cpp