Merge pull request #18673 from totten/master-gitignore