From: Russ Cox <rsc@golang.org>
Date: Tue, 2 Feb 2016 16:45:03 +0000 (-0500)
Subject: all: merge master into release-branch.go1.6
X-Git-Tag: go1.6rc2~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=62e5355fdd649171dc601b88a2a15e69061e7890;p=gostls13.git

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

Change-Id: I2f98729ca7209f284dabf33d0dea974873f16ada
---

62e5355fdd649171dc601b88a2a15e69061e7890