nvda

b546db61 - Merge branch 'rc' into beta