Auto merge of #1932 - steveklabnik:gh1767, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:20:19 +0000 (16:20 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:20:19 +0000 (16:20 +0000)
Fixes #1767


Trivial merge