Auto merge of #4798 - GuillaumeGomez:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 8 Jan 2018 23:41:12 +0000 (23:41 +0000)
committerbors <bors@rust-lang.org>
Mon, 8 Jan 2018 23:41:12 +0000 (23:41 +0000)
Fix issues

Fixes #4786.


Trivial merge