Merge git (1:1.7.10.4-1+wheezy5+rpi1) import into refs/heads/workingbranch
authorRaspbian forward porter <root@raspbian.org>
Fri, 1 Sep 2017 04:07:56 +0000 (05:07 +0100)
committerRaspbian forward porter <root@raspbian.org>
Fri, 1 Sep 2017 04:07:56 +0000 (05:07 +0100)

Trivial merge