Merge remote-tracking branch 'upstream/master'

Conflicts:
	CSharp.gitignore
	VB.Net.gitignore