From: bors <bors@rust-lang.org>
Date: Mon, 6 Feb 2017 01:49:47 +0000 (+0000)
Subject: Auto merge of #3652 - alexcrichton:beta-next, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ca8f6e4b0731e7feffdc0f87c5033f61089712e;p=cargo.git

Auto merge of #3652 - alexcrichton:beta-next, r=alexcrichton

Fix beta branch CI

Cherry pick a few commits from master
---

4ca8f6e4b0731e7feffdc0f87c5033f61089712e