nvda

cbc97a6d - Merge branch 'master' into art