nvda

5b70588f - Merge branch 'rc' into beta