pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Thu, 8 Feb 2018 05:23:56 +0000 (05:23 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Thu, 8 Feb 2018 05:23:56 +0000 (05:23 +0000)

Trivial merge