Fix light issue on NVideo cards
Merge remote-tracking branch 'origin/master'