Final
Merge remote-tracking branch 'origin/paco'

Conflicts:
	licenses.licx
	licenses.licx.bak