Version bump.
Merge branch 'release' into develop

Conflicts:
	debian/changelog