Shader changes.
Merge branch 'newbranch'