pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Sat, 10 Jun 2017 05:17:55 +0000 (05:17 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Sat, 10 Jun 2017 05:17:55 +0000 (05:17 +0000)

Trivial merge