PL: Minor adjustment
Merge remote-tracking branch 'Val/master' into frodo

Conflicts:
	1080i/includes.xml