pseudomerge to tie together broken upstream history
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 22 Aug 2019 16:45:08 +0000 (17:45 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 22 Aug 2019 16:45:08 +0000 (17:45 +0100)

Trivial merge