Merge remote-tracking branch 'origin/master'

Conflicts:
	debian/control
	debian/copyright