2801: #2799 was incomplete, this brings master in line with what's released r=mergify[bot] a=nextgens ## What type of PR? bug-fix ## What does this PR do? Need this too. Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>