Merge tag 'debian/0.18.1-2' into wheezy-backports