Auto merge of #5291 - matklad:regression-backport, r=matklad
authorbors <bors@rust-lang.org>
Wed, 4 Apr 2018 06:36:13 +0000 (06:36 +0000)
committerbors <bors@rust-lang.org>
Wed, 4 Apr 2018 06:36:13 +0000 (06:36 +0000)
[beta] backport #5288


Trivial merge