Auto merge of #5599 - gibix:fix/4746, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 1 Jun 2018 15:44:37 +0000 (15:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 1 Jun 2018 15:44:37 +0000 (15:44 +0000)
fix #4746 and add test


Trivial merge