merge with debian-sid release 0.8.15