Upstream merge.
1.7.10
Resolve conflict in .gitignore
Upstream merge.