Patch to fix .gitignore.
Merge branch 'with-make/master'