Fix for Sampler States that used object.Sample() rather than tex2D(sampler, texCoord).
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #1772 from SickheadGames/develop

Sampler State Fix - trust you on this one. The only other dx platform would be windows phone right?