upstream/1.2.6+ds
2342fee3 · Merge tag 'upstream/1.2.6' into repackaged ·