nvda

b56bf0af - Merge branch 'master' into t2961