Merge branch 'master' into np

Conflicts:
	Source/Core/VideoCommon/Src/CommandProcessor.cpp
	Source/Core/VideoCommon/Src/CommandProcessor.h