pseudomerge to tie together broken upstream history
authorRaspbian forward pporter <root@raspbian.org>
Wed, 28 Mar 2018 22:44:06 +0000 (23:44 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Wed, 28 Mar 2018 22:44:06 +0000 (23:44 +0100)

Trivial merge