nvda

843cf019 - Merge branch 'beta' into master.