Merge branch 'master' into GLSL-cleanups

Conflicts:
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
move struct Light declaration out of uniform block