Backport: release
@ben.boeckel @cory.quammen
Do: merge
mentioned in commit 1087b587
merged
mentioned in commit 27a340ec