pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Fri, 21 Sep 2018 01:38:14 +0000 (02:38 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Fri, 21 Sep 2018 01:38:14 +0000 (02:38 +0100)

Trivial merge