nvda

1943148b - Merge branch 'master' into next