Auto merge of #1935 - steveklabnik:gh1898, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:07:53 +0000 (22:07 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:07:53 +0000 (22:07 +0000)
Fixes #1898


Trivial merge