nvda

f38751bb - Merge branch 'master' (early part) into beta