pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Fri, 27 Jul 2018 00:17:18 +0000 (01:17 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Fri, 27 Jul 2018 00:17:18 +0000 (01:17 +0100)

Trivial merge