Merge golang-1.7 (1.7.4-2+rpi1) import into refs/heads/workingbranch
authorRaspbian forward porter <root@raspbian.org>
Wed, 26 Apr 2017 20:36:28 +0000 (20:36 +0000)
committerRaspbian forward porter <root@raspbian.org>
Wed, 26 Apr 2017 20:36:28 +0000 (20:36 +0000)

Trivial merge