Merge tag 'debian/0.12-1'