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)
commit9275e0d0aa69406385dfc11cd09c664472e6e539
tree0a33e6b9008ea996615068e1fb569aa21d7ee16c
parentdd28cd3be90a8478e5eca070233cba902cac8887
parentfb12480a57e14bf0a508659a089889d5a7bd1b4b
Auto merge of #4798 - GuillaumeGomez:patch-1, r=alexcrichton

Fix issues

Fixes #4786.