riga 2164
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debian/DeveloperGuide/debian_developer_reference_traduzioneAT.po