merge tag upstream/1.6.2 with debian-subdir