Merge 'master' into tev_fixes. Conflicts: Source/Plugins/Plugin_VideoDX9/Src/Render.cpp Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
