Merge remote-tracking branch 'savannah/master' into HEAD
authorAndrea Corallo <akrl@sdf.org>
Mon, 13 Apr 2020 17:11:12 +0000 (18:11 +0100)
committerAndrea Corallo <akrl@sdf.org>
Mon, 13 Apr 2020 17:11:12 +0000 (18:11 +0100)

Trivial merge