Merge tag 'debian/0.17-4'