.gitignore additions
Merge commit 'b33fe1c'