pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Thu, 19 Jan 2017 05:12:54 +0000 (05:12 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Thu, 19 Jan 2017 05:12:54 +0000 (05:12 +0000)

Trivial merge