Merge pull request #1373 from blckmn/git.ignore