Part 8 of 15
Merge remote-tracking branch 'origin/1.8.1' into 1.8.1

Conflicts:
	.gitignore