merge debian/1.3.6-3