Update debian dir as in debian repo
Merge branch '1.3-master'

Conflicts:
	debian/watch