Auto merge of #2384 - jseyfried:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 12 Feb 2016 22:09:11 +0000 (22:09 +0000)
committerbors <bors@rust-lang.org>
Fri, 12 Feb 2016 22:09:11 +0000 (22:09 +0000)
r? @alexcrichton


Trivial merge