nvda

80902c49 - Merge branch 'master' into next