More cosmetics
Merge remote-tracking branch 'upstream/master' into mod

Conflicts:
	1080i/Home.xml