Merge branch 'nd/gitignore-trailing-whitespace' into maint