Merge remote-tracking branch 'origin/master' into Android-trash Conflicts: Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
