Merge with Trunk revision 11046.
.gitignore is getting on my nerves.