pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Sun, 28 May 2017 11:09:44 +0000 (11:09 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Sun, 28 May 2017 11:09:44 +0000 (11:09 +0000)

Trivial merge