Auto merge of #1933 - steveklabnik:gh1855, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:08:03 +0000 (16:08 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:08:03 +0000 (16:08 +0000)
Fixes #1855


Trivial merge