Auto merge of #2439 - jespino:issue-2402, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 6 Mar 2016 18:18:40 +0000 (18:18 +0000)
committerbors <bors@rust-lang.org>
Sun, 6 Mar 2016 18:18:40 +0000 (18:18 +0000)

Trivial merge