Auto merge of #1934 - steveklabnik:gh1930, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:34:31 +0000 (22:34 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:34:31 +0000 (22:34 +0000)
Fixes #1930


Trivial merge