Merge branch 'experimental' into bartholomea

Conflicts:
	debian/changelog
Release to staging