pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Thu, 2 Nov 2017 21:52:02 +0000 (21:52 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Thu, 2 Nov 2017 21:52:02 +0000 (21:52 +0000)

Trivial merge