1.2.5
Merge branch 'saucy' into precise

Conflicts:
	debian/changelog