Just adding some comments for clarity.
Merge remote-tracking branch 'origin/1.0.5' into 1.0.5

Conflicts:
	PartsSheet.cs