pseudomerge to tie together broken upstream history
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 20 Jun 2019 16:10:28 +0000 (17:10 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 20 Jun 2019 16:10:28 +0000 (17:10 +0100)

Trivial merge