Merge golang-1.7 (1.7.6-1) import into refs/heads/workingbranch
authorMichael Hudson-Doyle <michael.hudson@ubuntu.com>
Thu, 1 Jun 2017 09:31:53 +0000 (10:31 +0100)
committerMichael Hudson-Doyle <michael.hudson@ubuntu.com>
Thu, 1 Jun 2017 09:31:53 +0000 (10:31 +0100)

Trivial merge