nvda

47bcd258 - Merge branch 'master' into t3472