Ignoring project files
Merge remote-tracking branch 'origin/2.6-branch' into develop

Conflicts:
	.gitignore