security-updates merged

[Ludovic Courtès]

Hello!

I’ve just merged ‘security-updates’ into ‘master’.  There are no new
security fixes in there, only the integration of fixes that used to be
available via grafting.

Ludo’.