nvda

471e39ad - Merge branch 'master' into beta