pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Thu, 26 Oct 2017 15:08:16 +0000 (16:08 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Thu, 26 Oct 2017 15:08:16 +0000 (16:08 +0100)

Trivial merge