Auto merge of #2400 - JIghtuse:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 24 Feb 2016 17:12:29 +0000 (17:12 +0000)
committerbors <bors@rust-lang.org>
Wed, 24 Feb 2016 17:12:29 +0000 (17:12 +0000)
Fixes #2378


Trivial merge