pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Sat, 1 Jul 2017 23:31:05 +0000 (00:31 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Sat, 1 Jul 2017 23:31:05 +0000 (00:31 +0100)

Trivial merge