pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Wed, 20 Jun 2018 01:08:32 +0000 (02:08 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Wed, 20 Jun 2018 01:08:32 +0000 (02:08 +0100)

Trivial merge