Merge branch 'nvmrc' - Fixes #404