nvda

a4afe098 - Merge branch 'beta' into master