Merge branch 'master' into armjit-fpu

Conflicts:
	Core/MIPS/MIPSVFPUUtils.cpp
	Core/MIPS/x86/CompVFPU.cpp
	GPU/GLES/VertexDecoder.cpp

Core/HLE/sceKernelThread.cpp

@@ -2805,7 +2805,10 @@ std::vector<DebugThreadInfo> GetThreadsInfo()
 		info.name[KERNELOBJECT_MAX_NAME_LENGTH] = 0;
 		info.status = t->nt.status;
 		info.entrypoint = t->nt.entrypoint;
-		info.curPC = t->context.pc;
+		if(*iter == currentThread)
+			info.curPC = currentMIPS->pc;
+		else
+			info.curPC = t->context.pc;
 		info.isCurrent = (*iter == currentThread);
 		threadList.push_back(info);
 	}