nvda

1776ab98 - Merge branch 'master' into beta