pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Thu, 31 Aug 2017 12:19:40 +0000 (13:19 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Thu, 31 Aug 2017 12:19:40 +0000 (13:19 +0100)

Trivial merge