Auto merge of #2351 - rbtcollins:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 2 Feb 2016 06:12:10 +0000 (06:12 +0000)
committerbors <bors@rust-lang.org>
Tue, 2 Feb 2016 06:12:10 +0000 (06:12 +0000)

Trivial merge