Merge tag 'upstream/2.4.4'
authorAlastair McKinstry <mckinstry@debian.org>
Mon, 15 Jul 2019 07:49:00 +0000 (08:49 +0100)
committerAlastair McKinstry <mckinstry@debian.org>
Mon, 15 Jul 2019 07:49:00 +0000 (08:49 +0100)

Trivial merge