Auto merge of #1936 - steveklabnik:gh1870, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:48:11 +0000 (22:48 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:48:11 +0000 (22:48 +0000)
Fixes #1870


Trivial merge