From: Chris Broadfoot <cbro@golang.org>
Date: Thu, 21 Jul 2016 19:38:13 +0000 (-0700)
Subject: all: merge master into release-branch.go1.7
X-Git-Tag: go1.7rc3~1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=16a2af03f17e5b2bcf468442e66ef7a99ae55c70;p=gostls13.git

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

Change-Id: I2511c3f7583887b641c9b3694aae54789fbc5342
---

16a2af03f17e5b2bcf468442e66ef7a99ae55c70