Add generated files to .gitignore.
Merge remote branch 'upstream/master'