Fix bug with bad debian spec
Merge branch 'stable'

Conflicts:
	debian/control