Resynchronize with upstream package maintainer version.

Blindly commit previous changes before reworking for forthcoming stack release.

(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 tip

mercurial