pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Tue, 4 Dec 2018 19:54:54 +0000 (19:54 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Tue, 4 Dec 2018 19:54:54 +0000 (19:54 +0000)

Trivial merge