From: Chris Broadfoot <cbro@golang.org>
Date: Tue, 2 Aug 2016 21:44:08 +0000 (-0700)
Subject: all: merge master into release-branch.go1.7
X-Git-Tag: go1.7rc5~1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=17a48e0a000894129a46d6143b8854460575867e;p=gostls13.git

all: merge master into release-branch.go1.7

Change-Id: I77d1665af543dc71f30b2afa48eac411de11afc7
---

17a48e0a000894129a46d6143b8854460575867e