Shadow and light fix
Merge remote-tracking branch 'origin/master' into Shadow-and-light-fix