nvda

1afc63b9 - Merged master, fixing conflicts