Merge branch 'next'

Conflicts:
	debian/ceph.prerm