Merge branch 'saucy' into quantal

Conflicts:
	debian/changelog