shader fix
Merge remote-tracking branch 'origin/github' into github