pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Sun, 26 Aug 2018 13:36:08 +0000 (14:36 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Sun, 26 Aug 2018 13:36:08 +0000 (14:36 +0100)

Trivial merge